Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 31 Jan 2011 08:16:25 +0000 (00:16 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 31 Jan 2011 08:16:25 +0000 (00:16 -0800)

Trivial merge